Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:12:05 +0000 (06:12 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 2 Jun 2007 11:12:05 +0000 (06:12 -0500)

Trivial merge